Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 19 Jun 2010 12:15:25 +0000 (12:15 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 19 Jun 2010 12:15:25 +0000 (12:15 +0000)
commit627721499a59f21d83e71506dbb4f247c931962b
treeb6e57357f17ef6a9767362306718c523d931ea25
parent9cb94be6802bc36e323ffc788877513e99fb7dc1
parenta379546c876ffd09ba6108ee6e1704e9577b2422
Merge from mainline.